From 15b212e50aa402b6ed36312d0d1ade5bf3b2718e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 29 Apr 2015 11:30:20 -0700 Subject: [PATCH] Relax the test for ar/linker with plugins On windows it won't actually succeed or get past the first compile with cc/ar, so just set it to something that for sure won't exist so it doesn't progress on *any* platform. --- tests/test_cargo_compile_plugins.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/test_cargo_compile_plugins.rs b/tests/test_cargo_compile_plugins.rs index e5c4e979a..3417d01e6 100644 --- a/tests/test_cargo_compile_plugins.rs +++ b/tests/test_cargo_compile_plugins.rs @@ -254,16 +254,14 @@ test!(native_plugin_dependency_with_custom_ar_linker { .file("src/lib", "") .file(".cargo/config", &format!(r#" [target.{}] - ar = "ar" - linker = "cc" + ar = "nonexistent-ar" + linker = "nonexistent-linker" "#, target)); foo.build(); assert_that(bar.cargo_process("build").arg("--verbose"), - execs().with_stdout(&format!("\ + execs().with_stdout(&format!("\ {compiling} foo v0.0.1 ({url}) -{running} `rustc [..] -C ar=ar -C linker=cc [..]` -{compiling} bar v0.0.1 ({url}) -{running} `rustc [..] -C ar=ar -C linker=cc [..]` +{running} `rustc [..] -C ar=nonexistent-ar -C linker=nonexistent-linker [..]` ", compiling = COMPILING, running = RUNNING, url = bar.url()))) }); -- 2.30.2